API: Remove gtk_widget_push_colormap()

And of course, gtk_widget_pop_colormap() is gone, too.
No replacement is necessary, the function is basically unused.

diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 62e4835277a5f4f1563923f0442e38f72e0e3bd8..be28eb13e79a224c99d1dc0832fcc354cde644b7 100644 (file)
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -4816,8 +4816,6 @@ gtk_widget_set_style
 gtk_widget_ensure_style
 gtk_widget_get_style
 gtk_widget_reset_rc_styles
-gtk_widget_push_colormap
-gtk_widget_pop_colormap
 gtk_widget_set_default_colormap
 gtk_widget_get_default_style
 gtk_widget_get_default_colormap

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index fc80fc671642b0875a72ff674ca945019b144575..c7d1a459e4ac465694a22c6ae47ceaadc20ed6e3 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -4280,9 +4280,7 @@ gtk_widget_modify_text
 gtk_widget_modify_symbolic_color
 gtk_widget_new
 gtk_widget_path
-gtk_widget_pop_colormap
 gtk_widget_pop_composite_child
-gtk_widget_push_colormap
 gtk_widget_push_composite_child
 gtk_widget_queue_draw
 gtk_widget_queue_draw_area

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index a76f172190575c17e86c90e0b9fb6e0a9c836a16..244098d0ba0d92889e4b62ff08163171a141e7dc 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3135,13 +3135,10 @@ set_icon_stock_pixbuf (GdkDragContext    *context,
 
   screen = gdk_drawable_get_screen (context->source_window);
 
-  /* Push a NULL colormap to guard against gtk_widget_push_colormap() */
-  gtk_widget_push_colormap (NULL);
   window = gtk_window_new (GTK_WINDOW_POPUP);
   gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND);
   gtk_window_set_screen (GTK_WINDOW (window), screen);
   set_can_change_screen (window, TRUE);
-  gtk_widget_pop_colormap ();
 
   gtk_widget_set_events (window, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
   gtk_widget_set_app_paintable (window, TRUE);
@@ -3306,13 +3303,10 @@ gtk_drag_set_icon_surface (GdkDragContext    *context,
 
   screen = gdk_drawable_get_screen (context->source_window);
 
-  /* Push a NULL colormap to guard against gtk_widget_push_colormap() */
-  gtk_widget_push_colormap (NULL);
   window = gtk_window_new (GTK_WINDOW_POPUP);
   gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DND);
   gtk_window_set_screen (GTK_WINDOW (window), screen);
   set_can_change_screen (window, TRUE);
-  gtk_widget_pop_colormap ();
 
   gtk_widget_set_events (window, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
   gtk_widget_set_app_paintable (window, TRUE);

diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index f28f444d098d6d536dcca213b54f2ad46efeb462..b8a5e67b3b2b74736639c7c6b342c1def1516a0f 100644 (file)
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -100,7 +100,6 @@ static void
 gtk_invisible_init (GtkInvisible *invisible)
 {
   GtkInvisiblePrivate *priv;
-  GdkColormap *colormap;
 
   invisible->priv = G_TYPE_INSTANCE_GET_PRIVATE (invisible,
                                                  GTK_TYPE_INVISIBLE,
@@ -114,10 +113,6 @@ gtk_invisible_init (GtkInvisible *invisible)
 
   priv->has_user_ref_count = TRUE;
   priv->screen = gdk_screen_get_default ();
-
-  colormap = _gtk_widget_peek_colormap ();
-  if (colormap)
-    gtk_widget_set_colormap (GTK_WIDGET (invisible), colormap);
 }
 
 static void

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d66660acc984fb14ba09b764680b534fa6c1074e..40a0e60105e1f194184bff2dbb90a5a2d55b8bb3 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -437,7 +437,6 @@ static void gtk_widget_add_events_internal (GtkWidget *widget,
 static gpointer         gtk_widget_parent_class = NULL;
 static guint            widget_signals[LAST_SIGNAL] = { 0 };
 static GtkStyle        *gtk_default_style = NULL;
-static GSList          *colormap_stack = NULL;
 static guint            composite_child_stack = 0;
 static GtkTextDirection gtk_default_direction = GTK_TEXT_DIR_LTR;
 static GParamSpecPool  *style_property_spec_pool = NULL;
@@ -8991,35 +8990,6 @@ gtk_widget_pop_composite_child (void)
     composite_child_stack--;
 }
 
-/**
- * gtk_widget_push_colormap:
- * @cmap: a #GdkColormap
- *
- * Pushes @cmap onto a global stack of colormaps; the topmost
- * colormap on the stack will be used to create all widgets.
- * Remove @cmap with gtk_widget_pop_colormap(). There's little
- * reason to use this function.
- **/
-void
-gtk_widget_push_colormap (GdkColormap *cmap)
-{
-  g_return_if_fail (!cmap || GDK_IS_COLORMAP (cmap));
-
-  colormap_stack = g_slist_prepend (colormap_stack, cmap);
-}
-
-/**
- * gtk_widget_pop_colormap:
- *
- * Removes a colormap pushed with gtk_widget_push_colormap().
- **/
-void
-gtk_widget_pop_colormap (void)
-{
-  if (colormap_stack)
-    colormap_stack = g_slist_delete_link (colormap_stack, colormap_stack);
-}
-
 /**
  * gtk_widget_set_default_colormap:
  * @colormap: a #GdkColormap
@@ -9439,21 +9409,6 @@ gtk_widget_real_adjust_size_request (GtkWidget         *widget,
     }
 }
 
-/**
- * _gtk_widget_peek_colormap:
- * 
- * Returns colormap currently pushed by gtk_widget_push_colormap, if any.
- * 
- * Return value: the currently pushed colormap, or %NULL if there is none.
- **/
-GdkColormap*
-_gtk_widget_peek_colormap (void)
-{
-  if (colormap_stack)
-    return (GdkColormap*) colormap_stack->data;
-  return NULL;
-}
-
 /**
  * _gtk_widget_peek_request_cache:
  * 

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 21f9455b813c7e05846156e96298f6a7a28d0cb9..9faaad7aaa51a0fd7a0efe04f428ce9f3a72d0c5 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -860,10 +860,8 @@ void       gtk_widget_reset_rc_styles   (GtkWidget      *widget);
  * This will override the values that got set by the
  * gtk_widget_set_default_* () functions.
  */
-void        gtk_widget_push_colormap        (GdkColormap *cmap);
 void        gtk_widget_push_composite_child (void);
 void        gtk_widget_pop_composite_child  (void);
-void        gtk_widget_pop_colormap         (void);
 
 /* widget style properties
  */
@@ -986,8 +984,6 @@ void       _gtk_widget_synthesize_crossing (GtkWidget      *from,
                                             GdkDevice      *device,
                                            GdkCrossingMode mode);
 
-GdkColormap* _gtk_widget_peek_colormap (void);
-
 gpointer     _gtk_widget_peek_request_cache (GtkWidget *widget);
 
 void         _gtk_widget_buildable_finish_accelerator (GtkWidget *widget,

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 7704565e1e7bce499208d8bf1aca18edfa87d95a..96ebd48b86dd7cdac15b9ff55c7ab4486186c157 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -972,13 +972,12 @@ static void
 gtk_window_init (GtkWindow *window)
 {
   GtkWindowPrivate *priv;
-  GdkColormap *colormap;
 
   window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window,
                                               GTK_TYPE_WINDOW,
                                               GtkWindowPrivate);
   priv = window->priv;
-
+  
   gtk_widget_set_has_window (GTK_WIDGET (window), TRUE);
   _gtk_widget_set_is_toplevel (GTK_WIDGET (window), TRUE);
 
@@ -1021,10 +1020,6 @@ gtk_window_init (GtkWindow *window)
   priv->startup_id = NULL;
   priv->mnemonics_visible = TRUE;
 
-  colormap = _gtk_widget_peek_colormap ();
-  if (colormap)
-    gtk_widget_set_colormap (GTK_WIDGET (window), colormap);
-  
   g_object_ref_sink (window);
   priv->has_user_ref_count = TRUE;
   toplevel_list = g_slist_prepend (toplevel_list, window);